Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 5 Jun 2010 11:10:33 +0000 (11:10 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 5 Jun 2010 11:10:33 +0000 (11:10 +0000)
commit96e1af7620379391da84e95a4b5b919e90c90f04
tree93f73ad41684974e33bcaa7f15cacc57a649500b
parente2bc36d8c2bc5143d5b598eff96ba48e545a372e
parent4291382f795d439f5b218b99ca2111d0b071e237
Merge from mainline.